Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Sep 2011 04:20:20 +0000 (21:20 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Sep 2011 04:20:20 +0000 (21:20 -0700)
commit922a5d71e37410182c0f6e4a4e09d381bc65d92b
treef5ef2e1cc07cd4461ef664fcedebbba2637d4470
parent702a3ac01484808d9bf1523113b4f8a2d7011c63
parentd1bb650b61418e3aefaf34d49e81bd655cff7161
Merge from trunk.